Merge akbargumbira:master to AIFDR:master

This PR is for 2.0.3 release.

Note: akbargumbira:master is identical with AIFDR:develop. So basically merging AIFDR:develop to AIFDR:master