metadata storage CR
avoid NPE
Merge branch 'develop' into RC