Merge "support image loader extension" into devel/master